Merge git://git.denx.de/u-boot-video
authorTom Rini <[email protected]>
Thu, 11 Jan 2018 18:43:36 +0000 (13:43 -0500)
committerTom Rini <[email protected]>
Thu, 11 Jan 2018 18:43:36 +0000 (13:43 -0500)

Trivial merge